Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat, fix: canvas v2 followups 1 #6819

Merged
merged 14 commits into from
Sep 7, 2024

Conversation

psychedelicious
Copy link
Collaborator

@psychedelicious psychedelicious commented Sep 6, 2024

Summary

Misc canvas v2 followups - see commits for details.

Related Issues / Discussions

Some feedback from offline discussions/discord

QA Instructions

Try the things in the list of commits.

Merge Plan

n/a

Checklist

  • The PR has a short but descriptive title, suitable for a changelog
  • Tests added / updated (if applicable)
  • Documentation added / updated (if applicable)

@github-actions github-actions bot added the frontend PRs that change frontend files label Sep 6, 2024
- Each entity gets its own `CanvasEntityFilterer`
- Add auto-preview feature to filter, debounced by 1000ms leading + trailing
- Fix flash when preview updates
@psychedelicious psychedelicious marked this pull request as draft September 7, 2024 08:15
Hopefully this resolves the issue w/ alt as a quick switch for color picker on windows.
- Add selectors to get the default control adapter and ip adapter with model, preferring controlnet over t2i adapter for model
- Add hooks to add each entity type, using the defaults
- Add hooks to add prompts/ip adapters to a regional guidance layer
- Use the defaults in other places where we add control layers or ip adapters (e.g. dnd-triggered entity creation)
This API is not available in all browsers. Also add an eslint rule to prevent usage in the future.
There's a race condition where we sometimes get progress events from canceled queue items, depending on the timing of the cancellation request and last event or two from the queue item.

I can't imagine how to resolve this except by tracking all cancellations and ignoring events for cancelled items, which is implemented in this change.
@psychedelicious psychedelicious marked this pull request as ready for review September 7, 2024 13:00
@psychedelicious psychedelicious changed the title feat: canvas v2 followups 1 feat/fix: canvas v2 followups 1 Sep 7, 2024
@psychedelicious psychedelicious changed the title feat/fix: canvas v2 followups 1 feat, fix: canvas v2 followups 1 Sep 7, 2024
@psychedelicious psychedelicious merged commit 60d2541 into main Sep 7, 2024
27 checks passed
@psychedelicious psychedelicious deleted the psyche/feat/canvas-v2-followups-1 branch September 7, 2024 20:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
frontend PRs that change frontend files
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants